From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 16 May 2012 23:12:39 +0000 (+0200)
Subject: sessionMode: Add hasAppMenu property
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6564
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6bee51ed33bb0dc8a061d82025eca9eda2ceb041;p=gnome-shell.git

sessionMode: Add hasAppMenu property

Add a sessionMode.hasAppMenu property, which determines whether
the top bar should contain a menu for the active application or
not.

https://bugzilla.gnome.org/show_bug.cgi?id=676156
---

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 45aabb218..eb3a9e793 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -972,7 +972,7 @@ const Panel = new Lang.Class({
             this._menus.addMenu(this._activitiesButton.menu);
         }
 
-        if (Main.sessionMode.sessionType == Shell.SessionType.USER) {
+        if (Main.sessionMode.hasAppMenu) {
             this._appMenu = new AppMenuButton(this._menus);
             this._leftBox.add(this._appMenu.actor);
         }
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 3ab89c182..3e05400b9 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -9,9 +9,11 @@ const DEFAULT_MODE = 'user';
 
 const _modes = {
     'gdm': { hasOverview: false,
+             hasAppMenu: false,
              sessionType: Shell.SessionType.GDM },
 
     'user': { hasOverview: true,
+              hasAppMenu: true,
               sessionType: Shell.SessionType.USER }
 };